Merge branch 'wip/carlosg/for-master' into 'master'
authorMatthias Clasen <mclasen@redhat.com>
Fri, 25 Sep 2020 17:49:59 +0000 (17:49 +0000)
committerMatthias Clasen <mclasen@redhat.com>
Fri, 25 Sep 2020 17:49:59 +0000 (17:49 +0000)
Wip/carlosg/for master

Closes #3125 and #3121

See merge request GNOME/gtk!2621


Trivial merge